Auto merge of #1383 - alexcrichton:issue-1381, r=huonw
authorbors <bors@rust-lang.org>
Fri, 6 Mar 2015 00:47:35 +0000 (00:47 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Mar 2015 00:47:35 +0000 (00:47 +0000)
Ensure we don't get erroneous information about invalid log levels or such.

Closes #1381


Trivial merge